77. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-03-13 03:00:44 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

77.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/code/Mageplaza/LayeredNavigation/view/frontend/templates/layerview.phtml2022-04-29 13:34:12 +0000
2Porto v4.0.5/Porto Theme/app/code/Mageplaza/LayeredNavigation/view/frontend/templates/layerview.phtml2023-02-06 13:09:54 +0000

77.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged16116
Changed1171
Inserted24
Removed22

77.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

77.4 Active regular expressions

No regular expressions were active.

77.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Mageplaza 3  * Mageplaza
4  * 4  *
5  * NOTICE OF LICENSE 5  * NOTICE OF LICENSE
6  * 6  *
7  * This source file is subject to the Mageplaza.com license that is 7  * This source file is subject to the Mageplaza.com license that is
8  * available through the world-wide-web at this URL: 8  * available through the world-wide-web at this URL:
9  * https://www.mageplaza.com/LICENSE.txt 9  * https://www.mageplaza.com/LICENSE.txt
10  * 10  *
11  * DISCLAIMER 11  * DISCLAIMER
12  * 12  *
13  * Do not edit or add to this file if you wish to upgrade this extension to newer 13  * Do not edit or add to this file if you wish to upgrade this extension to newer
14  * version in the future. 14  * version in the future.
15  * 15  *
16  * @category    Mageplaza 16  * @category    Mageplaza
17  * @package     Mageplaza_LayeredNavigation 17  * @package     Mageplaza_LayeredNavigation
18  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/) 18  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
19  * @license     https://www.mageplaza.com/LICENSE.txt 19  * @license     https://www.mageplaza.com/LICENSE.txt
20  */ 20  */
21 ?> 21 
22 <?php if ($block->canShowBlock()): ?> 22 
if ($block->canShowBlock()): ?>
23     <?php 23     <?php
24     $filters     = $block->getFilters(); 24     $filters     = $block->getFilters();
25     $layerConfig = $this->helper('Mageplaza\LayeredNavigation\Helper\Data')->getLayerConfiguration($filters); 25     $helperData  = $this->helper(\Mageplaza\LayeredNavigation\Helper\Data::class);
    26     $layerConfig = $helperData->getLayerConfiguration($filters);
26     $filtered    = count($block->getLayer()->getState()->getFilters()); 27     $filtered    = count($block->getLayer()->getState()->getFilters());
    28     $helperImage = $this->helper(\Mageplaza\LayeredNavigation\Helper\Image::class);
27     $category = $block->getLayer()->getCurrentCategory(); 29     $category = $block->getLayer()->getCurrentCategory();
28     $hideAttributes = $category->getData('mp_ln_hide_attribute_ids'); 30     $hideAttributes = $category->getData('mp_ln_hide_attribute_ids');
29     ?> 31     ?>
30     <div class="block filter" id="layered-filter-block" 32     <div class="block filter" id="layered-filter-block"
31          data-mage-init='{"collapsible":{"openedState": "active", "collapsible": true, "active": false, "collateral": { "openedState": "filter-active", "element": "body" } }}'> 33          data-mage-init='{"collapsible":{"openedState": "active", "collapsible": true, "active": false, "collateral": { "openedState": "filter-active", "element": "body" } }}'>
32     
33         <div id="ln_overlay" class="ln_overlay"> 34         <div id="ln_overlay" class="ln_overlay">
34             <div class="loader"> 35             <div class="loader">
35                 <img src="<?php echo $block->getViewFileUrl('images/loader-1.gif'); ?>" alt="Loading..."> 36                 <img src="<?= /** @noEscape */ $block->getViewFileUrl('images/loader-1.gif')
 ?>" alt="Loading...">
36             </div> 37             </div>
37         </div> 38         </div>
38  39         <div class="block-title filter-title" data-count="<?= /** @noEscape */ $filtered ?>">
39         <div class="block-title filter-title" data-count="<?php /*
 @escapeNotVerified */
 40             <strong data-role="title"><?= /** @noEscape */ __('Shop By') ?></strong>
40         echo $filtered; ?>">    
41             <strong data-role="title"><?php /*
 @escapeNotVerified */
    
42                 echo __('Shop By') ?></strong>    
43         </div> 41         </div>
44         <div class="block-content filter-content" data-mage-init='{"mpLayer": <?php echo $
layerConfig
 ?>}'>
 42         <div class="block-content filter-content" data-mage-init='{"mpLayer": <?= /** @noEscape */ $block->escapeHtml($layerConfig) ?>}'>
45             <?php echo $block->getChildHtml('state') ?> 43             <?= /** @noEscape */ $block->getChildHtml('state') ?>
46     
47             <?php if ($block->getLayer()->getState()->getFilters()): ?> 44             <?php if ($block->getLayer()->getState()->getFilters()): ?>
48                 <div class="block-actions filter-actions"> 45                 <div class="block-actions filter-actions">
49                     <a href="<?php /* @escapeNotVerified */ 46                     <a href="<?= /** @noEscape */ $block->getClearUrl() ?>" class="action clear filter-clear">
50                     echo $block->getClearUrl() ?>" 47                         <span><?= /** @noEscape */ __('Clear All') ?></span>
51                        class="action clear filter-clear"><span><?php /* @escapeNotVerified */ 48                     </a>
52                             echo __('Clear All') ?></span></a>    
53                 </div> 49                 </div>
54             <?php endif; ?> 50             <?php endif; ?>
55     
56             <?php $wrapOptions = false; ?> 51             <?php $wrapOptions = false; ?>
57                 <?php foreach ($filters as $key => $filter): ?> 52             <?php foreach ($filters as $key => $filter): ?>
58             <?php if ($filter->getItemsCount() && $filter->getRequestVar() != 'cat'): ?> 53                 <?php if ($filter->getItemsCount()
): ?>
59             <?php if ($hideAttributes && is_array($hideAttributes) && in_array($filter->getRequestVar(), $hideAttributes, true)) {continue;} ?> 54                     <?php if ($hideAttributes && is_array($hideAttributes) && in_array($filter->getRequestVar(), $hideAttributes, true)) {continue;} ?>
60         <?php if (!$wrapOptions): ?> 55                     <?php if (!$wrapOptions): ?>
61                 <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?php echo __('Shopping Options') ?></strong> 56                         <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle">
    57                             <?= /** @noEscape */ __('Shopping Options') ?>
    58                         </strong>
62                 <div class="filter-options" id="narrow-by-list" data-role="content"> 59                         <div class="filter-options" id="narrow-by-list" data-role="content">
63                 <?php  $wrapOptions = true; endif; ?> 60                         <?php $wrapOptions = true;
64                 <div data-role="ln_collapsible" class="filter-options-item" attribute="<?php echo $filter->getRequestVar() ?>"> 61                     endif; ?>
65                     <div data-role="ln_title" class="filter-options-title"><?php /* @escapeNotVerified */ echo __($filter->getName()) ?></div> 62                     <div data-role="ln_collapsible" class="filter-options-item"
66                     <div data-role="ln_content" class="filter-options-content"><?php /*
 @escapeNotVerified */ echo $block->getChildBlock('renderer')->setFilter($filter)->render($filter); ?></div>
 63                          attribute="<?= /** @noEscape */ $filter->getRequestVar() ?>">
    64                         <div data-role="ln_title" class="filter-options-title">
    65                             <?= /** @noEscape */ __($filter->getName()) ?>
    66                             <?php if ($filter->hasAttributeModel()
    67                                 && $filter->getAttributeModel()->getData('show_tooltip') === '1'): ?>
    68                                 <?php
    69                                     $imageUrl = $helperImage->getTooltipThumbnail($filter);
    70                                     $tooltipContent = $helperData->getTooltipContent($filter);
    71                                 ?>
    72                                 <span class="ln_tooltip"  data-toggle="tooltip" title="<?= $block->escapeHtml($tooltipContent) ?>">
    73                                     <?php if ($imageUrl): ?>
    74                                     <image src="<?= $block->escapeUrl($imageUrl) ?>" width="22" height="22"
    75                                            class="ln_tooltip_thumbnail"
    76                                            alt="<?= $block->escapeHtml($tooltipContent) ?>">
    77                                     <?php endif; ?>
    78                                 </span>
    79                             <?php endif; ?>
    80                         </div>
    81                         <div data-role="ln_content" class="filter-options-content">
    82                             <?php if ($filter instanceof \Mageplaza\LayeredNavigation\Model\Layer\Filter\Category && $filter->isRenderCategoryTree()): ?>
    83                                 <?= /** @noEscape */ $block->getChildBlock('mplayer-renderer')->setFilter($filter)->render($filter) ?>
    84                             <?php else: ?>
    85                                 <
?= /** @noEscape */ 
$block->getChildBlock('renderer')->setFilter($filter)->render($filter)
 ?>
    86                             <?php endif; ?>
    87                         </div>
67                 </div> 88                     </div>
68                 <?php endif; ?> 89                 <?php endif; ?>
69                 <?php endforeach; ?> 90             <?php endforeach; ?>
70                 <?php if ($wrapOptions): ?> 91             <?php if ($wrapOptions): ?>
71             </div> 92                 </div>
72         <?php else: ?> 93             <?php else: ?>
73             <script> 94                 <script type="text/javascript">
74                 require([ 95                     require([
75                     'jquery' 96                         'jquery'
76                 ], function ($) { 97                     ], function ($) {
77                     $('#layered-filter-block').addClass('filter-no-options'); 98                         $('#layered-filter-block').addClass('filter-no-options');
78                 }); 99                     });
79             </script> 100                 </script>
80             <?php endif; ?> 101             <?php endif; ?>
81  102             <?= /** @noEscape */ $block->getChildHtml('layer_additional_info') ?>
82             <?php echo $block->getChildHtml('layer_additional_info') ?>    
83         </div> 103         </div>
84     </div> 104     </div>
    105     <?php if ($helperData->getHtmlHighLight()) {
    106         echo /** @noEscape */ $helperData->getHtmlHighLight($block->getLayout());
    107     } ?>
85 <?php endif; ?> 108 <?php endif; ?>